syslog-ng: add customization directory

Signed-off-by: Philip Prindeville <[email protected]>

diff --git a/admin/syslog-ng/Makefile b/admin/syslog-ng/Makefile
index 47e5cce0f3fc8b2d8162189b53e07e61f96760f2..e294ff5771d5823930ee1ea9a1181576f05540f8 100644 (file)
--- a/admin/syslog-ng/Makefile
+++ b/admin/syslog-ng/Makefile
@@ -2,7 +2,7 @@ include  $(TOPDIR)/rules.mk
 
 PKG_NAME:=syslog-ng
 PKG_VERSION:=3.9.1
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_MAINTAINER:=W. Michael Petullo <[email protected]>
 
@@ -30,7 +30,8 @@ define Package/syslog-ng/description
 endef
 
 define Package/syslog-ng/conffiles
-  /etc/syslog-ng.conf
+/etc/syslog-ng.conf
+/etc/syslog-ng.d/
 endef
 
 define Build/Configure
@@ -68,8 +69,8 @@ define Package/syslog-ng/install
                install-moduleLTLIBRARIES DESTDIR="$(1)"
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/syslog-ng.init $(1)/etc/init.d/syslog-ng
-       $(INSTALL_DIR) $(1)/etc
        $(INSTALL_DATA) ./files/syslog-ng.conf $(1)/etc
+       $(INSTALL_DIR) $(1)/etc/syslog-ng.d/
        $(call libtool_remove_files,$(1))
 endef
 

diff --git a/admin/syslog-ng/files/custom-logs.conf b/admin/syslog-ng/files/custom-logs.conf
deleted file mode 100644 (file)
index 9c8f441..0000000
--- a/admin/syslog-ng/files/custom-logs.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# place to put customization of logging
-

diff --git a/admin/syslog-ng/files/syslog-ng.conf b/admin/syslog-ng/files/syslog-ng.conf
index 9e09a79e2e943fd8141a57786d1027212eae5049..cae24a8484eab6963a509ba16591be4452eeaeb8 100644 (file)
--- a/admin/syslog-ng/files/syslog-ng.conf
+++ b/admin/syslog-ng/files/syslog-ng.conf
@@ -36,5 +36,6 @@ log {
        destination(messages);
 };
 
-@include "/etc/custom-logs.conf"
+# put any customization files in this directory
+@include "/etc/syslog-ng.d/"